Remove "macros"

1999-10-18  Havoc Pennington  <hp@pobox.com>

* Makefile.am (SUBDIRS): Remove "macros"

* configure.in: Don't use GNOME_INIT, handle case where we are
inside gnome-libs. AM_PATH_GTK for the GIF test

* src/Makefile.am: Change flags to work without libgnomeui,
comment out testpixbuf for now

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index acc61ea623df5249c9add4f9ed8f9d0a8229cf58..cb13ebfa2600582f71ee63cfcdf18927f1262493 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,13 @@
+1999-10-18  Havoc Pennington  <hp@pobox.com>
+
+       * Makefile.am (SUBDIRS): Remove "macros"
+
+       * configure.in: Don't use GNOME_INIT, handle case where we are
+       inside gnome-libs
+
+       * src/Makefile.am: Change flags to work without libgnomeui,
+       comment out testpixbuf for now
+
 1999-10-18  Federico Mena Quintero  <federico@redhat.com>
 
        * configure.in: Use $GTK_LIBS as the extra libs when checking for

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 59df1e08492a44c74b178fed2445e6005a9ecaae..25dcf9f00c41afaa7861944e18b3679e9d473243 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -29,12 +29,12 @@ libexec_LTLIBRARIES =               \
        $(XPM_LIB)      \
        $(TIFF_LIB)
 
-noinst_PROGRAMS = testpixbuf
+noinst_PROGRAMS = # testpixbuf
 DEPS = libgdk_pixbuf.la
-INCLUDES = $(GNOME_INCLUDEDIR)
+INCLUDES = $(GLIB_CFLAGS) $(LIBART_CFLAGS)
 AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
 
-LDADDS = libgdk_pixbuf.la @GNOME_LIBDIR@ @GNOMEUI_LIBS@
+LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS)
 
 testpixbuf_LDADD = $(LDADDS)